Skip to content

Conversation

@jsanz
Copy link
Member

@jsanz jsanz commented Nov 27, 2025

This PR configures Renovate and Backport to work with multiple branches in the repository.

Changes

Renovate Configuration

  • Adds baseBranches configuration to track both master and feature-layers branches
  • Adds dependencies label to PRs created by Renovate

Backport Configuration

  • Adds branchLabelMapping to map the feature-layers label to the feature-layers branch
  • Disables auto-merge by default (autoMerge: false)
  • Sets auto-merge method to squash when enabled

These changes enable Renovate to keep both branches up to date with dependency updates and improve the backport workflow for the feature-layers branch.

@prodsecmachine
Copy link

prodsecmachine commented Nov 27, 2025

Snyk checks have passed. No issues have been found so far.

Status Scanner Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues
Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@jsanz jsanz added ci Continuous Integration topics feature-layers labels Nov 27, 2025
@jsanz jsanz marked this pull request as ready for review November 27, 2025 17:38
@jsanz jsanz requested a review from Copilot November 27, 2025 17:38
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR configures Renovate and Backport tools to support multi-branch dependency management and backporting workflows. The changes enable automated dependency updates across both the master and feature-layers branches while providing better control over the backport process.

  • Configures Renovate to monitor and create dependency update PRs for both master and feature-layers branches
  • Adds dependencies label to all Renovate-generated PRs for easier identification
  • Configures Backport with branch label mapping and auto-merge settings for the feature-layers branch

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
renovate.json Adds multi-branch support and dependency labeling for Renovate
.backportrc.json Configures branch label mapping and auto-merge behavior for backport workflow

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@jsanz jsanz merged commit f9fd0b1 into elastic:master Nov 27, 2025
5 of 6 checks passed
@jsanz jsanz deleted the renovate/updates-per-branch branch November 27, 2025 17:39
github-actions bot pushed a commit that referenced this pull request Nov 27, 2025
@github-actions
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
feature-layers

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

jsanz added a commit that referenced this pull request Nov 27, 2025
(cherry picked from commit f9fd0b1)

Co-authored-by: Jorge Sanz <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci Continuous Integration topics feature-layers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants